do_set_trap_table()'s argument can be const.

Also, automatically generate const version of every guest handle
definition.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c
index 33e61b405285bab5e651d146f5bbea407162dd37..c2879f7c9a51394be0bec6cabbd3391b3fb524d7 100644 (file)
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@ -454,7 +454,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg)
 /* First time to add callback to xen/ia64, so let's just stick to
  * the newer callback interface.
  */
-long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg)
+long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg)
 {
     long ret;
 

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 8cc33eb1a28bf3e8b1f985a156a33ae0824acb4c..479376faed730247fdace1c3b1b2c950eff91693 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -2825,7 +2825,7 @@ long unregister_guest_nmi_callback(void)
     return 0;
 }
 
-long do_set_trap_table(XEN_GUEST_HANDLE(trap_info_t) traps)
+long do_set_trap_table(XEN_GUEST_HANDLE(const_trap_info_t) traps)
 {
     struct trap_info cur;
     struct vcpu *curr = current;

diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c
index 0106081cddd470bc50c5f321a82066fbec0c49c0..d0f863764960d6fb7d150aa19fb475c392c4580b 100644 (file)
--- a/xen/arch/x86/x86_32/traps.c
+++ b/xen/arch/x86/x86_32/traps.c
@@ -419,7 +419,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg)
 }
 
 
-long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg)
+long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg)
 {
     long ret;
 

diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index 3cf5359fdc67f1d40f602fcbc51ee6a534ce97de..47a0d805f0b8934184d4dfcdd9b7ecbfc63280e2 100644 (file)
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -470,7 +470,7 @@ static long unregister_guest_callback(struct callback_unregister *unreg)
 }
 
 
-long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg)
+long do_callback_op(int cmd, XEN_GUEST_HANDLE(const_void) arg)
 {
     long ret;
 

diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h
index 374f995aa631a6364340a87751d3df8cea2f3812..508cce6191d5023a0f98ab99bec4c9bd1f06f51d 100644 (file)
--- a/xen/include/asm-x86/hypercall.h
+++ b/xen/include/asm-x86/hypercall.h
@@ -34,7 +34,7 @@ do_physdev_op_compat(
 
 extern long
 do_set_trap_table(
-    XEN_GUEST_HANDLE(trap_info_t) traps);
+    XEN_GUEST_HANDLE(const_trap_info_t) traps);
 
 extern int
 do_mmu_update(

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index ba976cfb010d427a6855795113dbbc9fc84d68f3..e4cf73fc17e9dbcdd37c9b703ed907ac723e4ed3 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -36,7 +36,9 @@
 #endif
 
 #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-    ___DEFINE_XEN_GUEST_HANDLE(name, type)
+    ___DEFINE_XEN_GUEST_HANDLE(name, type);   \
+    ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)
+
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
 #define XEN_GUEST_HANDLE_64(name)       XEN_GUEST_HANDLE(name)

diff --git a/xen/include/public/arch-powerpc.h b/xen/include/public/arch-powerpc.h
index 0819659e31a0942cf0443c26e52472e8b836d447..be668baec2d6cee7ef76d771bc8f439ed2025530 100644 (file)
--- a/xen/include/public/arch-powerpc.h
+++ b/xen/include/public/arch-powerpc.h
@@ -32,7 +32,8 @@
     } __attribute__((__aligned__(8))) __guest_handle_ ## name
 
 #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-    ___DEFINE_XEN_GUEST_HANDLE(name, type)
+    ___DEFINE_XEN_GUEST_HANDLE(name, type);   \
+    ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)
 #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
 #define set_xen_guest_handle(hnd, val) \

diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h
index 72c13837b48ab241d25783282c57be81c99466aa..0638901b1fa32fdb236560b092997b4517d5e9e7 100644 (file)
--- a/xen/include/public/arch-x86/xen.h
+++ b/xen/include/public/arch-x86/xen.h
@@ -37,7 +37,8 @@
 #endif
 
 #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-    ___DEFINE_XEN_GUEST_HANDLE(name, type)
+    ___DEFINE_XEN_GUEST_HANDLE(name, type);   \
+    ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)
 #define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
 #define __XEN_GUEST_HANDLE(name)        __guest_handle_ ## name
 #define XEN_GUEST_HANDLE(name)          __XEN_GUEST_HANDLE(name)

diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
index 52c61a2eb3c8284c0c8e27e797a03615e5b79882..a3b1d2fc3f65a2415b2a2ddc777f21c155861ef4 100644 (file)
--- a/xen/include/public/xen.h
+++ b/xen/include/public/xen.h
@@ -48,7 +48,6 @@ __DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
 DEFINE_XEN_GUEST_HANDLE(long);
 __DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
 DEFINE_XEN_GUEST_HANDLE(void);
-__DEFINE_XEN_GUEST_HANDLE(cvoid, const void);
 
 DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 #endif